From: emellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com>
Date: Sat, 6 May 2006 14:42:12 +0000 (+0100)
Subject: Move the logic to find the Xen Python scripts above the import statements.
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~16108^2~9
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success//%22http:/www.example.com/cgi/success/?a=commitdiff_plain;h=4697d093c79c1fa4a004602e9c7d773a3c831d0d;p=xen.git

Move the logic to find the Xen Python scripts above the import statements.

Signed-off-by: Ewan Mellor <ewan@xensource.com>
---

diff --git a/tools/xm-test/lib/XmTestLib/__init__.py b/tools/xm-test/lib/XmTestLib/__init__.py
index 7127383067..f638003b08 100644
--- a/tools/xm-test/lib/XmTestLib/__init__.py
+++ b/tools/xm-test/lib/XmTestLib/__init__.py
@@ -3,13 +3,8 @@
 # Author: Dan Smith <danms@us.ibm.com>
 #
 
-from Console import *
-from Test import *
-from Xm import *
-from XenDomain import *
-from config import *
-from XenDevice import *
-from NetConfig import *
+import os.path
+import sys
 
 # Use the auxbin module in Xend to determine the correct Python path.  We
 # take the first installed instance of auxbin that we find, and then run it
@@ -28,6 +23,14 @@ for p in ['python%s' % sys.version[:3], 'python']:
             sys.path.append(libpath)
             break
 
+from Console import *
+from Test import *
+from Xm import *
+from XenDomain import *
+from config import *
+from XenDevice import *
+from NetConfig import *
+
 # Give this test a clean slate
 destroyAllDomUs()